From 55eb8073f241f9875345c23a4c4f9ea3e6ba8026 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 28 Jan 2009 04:28:18 +0000
Subject: [PATCH] Revert r46417 "Skip dupe warnings when it's a titles are the
 same and it's a reupload." Notice: Undefined property:
 UploadForm::$mIsReUpload in
 /Library/WebServer/Documents/trunk/includes/specials/SpecialUpload.php on
 line 771

---
 RELEASE-NOTES                       |  2 --
 includes/specials/SpecialUpload.php | 12 ++++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d56ddd5025..2e70162fad 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -106,8 +106,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15391) catch DBQueryErrors on external storage insertion. This avoids error 
   messages on save were the edit in fact is saved.
 * (bug 17184) Remove duplicate "z" accesskey in MonoBook
-* Remove redundant dupe warnings on reupload for the same title. Dupe warnings
-  for identical files at different titles are still given.
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 06082786e0..207f44e8c2 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -550,7 +550,7 @@ class UploadForm {
 				$warning .= self::getExistsWarning( $this->mLocalFile );
 			}
 			
-			$warning .= $this->getDupeWarning( $this->mTempPath, $finalExt, $nt );
+			$warning .= $this->getDupeWarning( $this->mTempPath, $finalExt );
 			
 			if( $warning != '' ) {
 				/**
@@ -757,7 +757,7 @@ class UploadForm {
 	 * Check for duplicate files and throw up a warning before the upload
 	 * completes.
 	 */
-	function getDupeWarning( $tempfile, $extension, $destinationTitle ) {
+	function getDupeWarning( $tempfile, $extension ) {
 		$hash = File::sha1Base36( $tempfile );
 		$dupes = RepoGroup::singleton()->findBySha1( $hash );
 		$archivedImage = new ArchivedFile( null, 0, $hash.".$extension" );
@@ -766,12 +766,8 @@ class UploadForm {
 			$msg = "<gallery>";
 			foreach( $dupes as $file ) {
 				$title = $file->getTitle();
-				# Don't throw the warning when the titles are the same, it's a reupload
-				# and highly redundant.
-				if ( !$title->equals( $destinationTitle ) || !$this->mIsReUpload ) {
-					$msg .= $title->getPrefixedText() .
-						"|" . $title->getText() . "\n";
-				}
+				$msg .= $title->getPrefixedText() .
+					"|" . $title->getText() . "\n";
 			}
 			$msg .= "</gallery>";
 			return "<li>" .
-- 
2.20.1